Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[Struts-7] Merge master to 7xx 2024-01-20 #850

Merged
merged 47 commits into from
Jan 20, 2024

Conversation

lukaszlenart
Copy link
Member

Recent merge request of the master branch

kusalk and others added 30 commits December 29, 2023 14:11
Bumps org.apache.commons:commons-compress from 1.23.0 to 1.25.0.

---
updated-dependencies:
- dependency-name: org.apache.commons:commons-compress
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <[email protected]>
Stops cleaning nightlies to allow to coexist different versions
WW-5381 Introduce extension point for MethodAccessor
Bumps [org.apache.maven.plugins:maven-release-plugin](https://github.com/apache/maven-release) from 3.0.0-M1 to 3.0.1.
- [Release notes](https://github.com/apache/maven-release/releases)
- [Commits](apache/maven-release@maven-release-3.0.0-M1...maven-release-3.0.1)

---
updated-dependencies:
- dependency-name: org.apache.maven.plugins:maven-release-plugin
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <[email protected]>
….plugins-maven-release-plugin-3.0.1

Bump org.apache.maven.plugins:maven-release-plugin from 3.0.0-M1 to 3.0.1
Reduces log level to debug to reduce noise in the logs
[WW-5365] Reverts changes introduced in WW-5192 to allow evaluate the value attribute of Radio tag
dependabot bot and others added 16 commits January 15, 2024 01:30
Bumps [actions/upload-artifact](https://github.com/actions/upload-artifact) from 4.0.0 to 4.1.0.
- [Release notes](https://github.com/actions/upload-artifact/releases)
- [Commits](actions/upload-artifact@c7d193f...1eb3cb2)

---
updated-dependencies:
- dependency-name: actions/upload-artifact
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <[email protected]>
…/upload-artifact-4.1.0

Bump actions/upload-artifact from 4.0.0 to 4.1.0
…ns-commons-compress-1.25.0

Bump org.apache.commons:commons-compress from 1.23.0 to 1.25.0
[WW-5374] Allows to prepend reportUri with Servlet context
Extends sleep period to avoid breaking a build
[WW-5357] Adds support for disabled attribute to anchor tag
@lukaszlenart
Copy link
Member Author

@jdyer1 FYI

@lukaszlenart lukaszlenart force-pushed the merge-master-to-7xx-2024-01-20 branch from 3a821c6 to 4c2ff3c Compare January 20, 2024 05:49
…-2024-01-20

# Conflicts:
#	Jenkinsfile
#	core/src/main/java/org/apache/struts2/dispatcher/MockDispatcher.java
#	core/src/main/java/org/apache/struts2/util/StrutsTestCaseHelper.java
#	core/src/test/java/org/apache/struts2/dispatcher/DispatcherTest.java
#	plugins/dwr/src/main/java/org/apache/struts2/validators/DWRValidator.java
#	plugins/portlet/src/main/java/org/apache/struts2/portlet/PortletApplicationMap.java
#	plugins/portlet/src/main/java/org/apache/struts2/portlet/dispatcher/Jsr168Dispatcher.java
#	plugins/portlet/src/test/java/org/apache/struts2/StrutsTestCasePortletTests.java
#	plugins/sitemesh/src/main/java/org/apache/struts2/sitemesh/OldDecorator2NewStrutsDecorator.java
@lukaszlenart lukaszlenart force-pushed the merge-master-to-7xx-2024-01-20 branch from 4c2ff3c to 13bf91b Compare January 20, 2024 08:29
Copy link

@lukaszlenart lukaszlenart merged commit 95ba165 into release/struts-7-0-x Jan 20, 2024
7 checks passed
@lukaszlenart lukaszlenart deleted the merge-master-to-7xx-2024-01-20 branch January 20, 2024 08:39
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants